From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 28 Apr 2010 15:45:45 +0000 (-0400)
Subject: Revert last  bug-reference-url-format change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7973
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3369cc1ad2f6642042330157e0d310ff671ce02c;p=emacs.git

Revert last  bug-reference-url-format change.

* progmodes/bug-reference.el (bug-reference-url-format): Revert
2010-04-27 change due to security risk.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23bbfba365a..be9bca5326b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/bug-reference.el (bug-reference-url-format): Revert
+	2010-04-27 change due to security risk.
+
 2010-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Make it possible to locally disable a globally enabled mode.
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 1ddfddf89c1..462f978ab78 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -51,8 +51,7 @@ It can use `match-string' to get parts matched against
 There is no default setting for this, it must be set per file.")
 
 ;;;###autoload
-(put 'bug-reference-url-format 'safe-local-variable
-     (lambda (s) (or (stringp s) (functionp s))))
+(put 'bug-reference-url-format 'safe-local-variable 'stringp)
 
 (defconst bug-reference-bug-regexp
   "\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)"